more windows and osx build fixes

diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs
index 3d448c49985154eca9f4154ed95d851cc23affdd..40bef041a1140bb3838642f9fe0599c7abefa2b1 100644 (file)
--- a/Assistant/Upgrade.hs
+++ b/Assistant/Upgrade.hs
@@ -165,7 +165,7 @@ upgradeToDistribution newdir cleanup distributionfile = do
        {- OS X uses a dmg, so mount it, and copy the contents into place. -}
        unpack = liftIO $ do
                olddir <- oldVersionLocation
-               withTmpDirIn (fromRawFilePath (parentDir (toRawFilePath newdir))) "git-annex.upgrade" $ \tmpdir -> do
+               withTmpDirIn (parentDir newdir) (toOsPath "git-annex.upgrade") $ \tmpdir -> do
                        void $ boolSystem "hdiutil"
                                [ Param "attach", File distributionfile
                                , Param "-mountpoint", File tmpdir

diff --git a/Utility/StatelessOpenPGP.hs b/Utility/StatelessOpenPGP.hs
index 874ed84e1988965940aa072ad1f58eca3daf9723..d3709baa276d83573da561843f95b9f4c55e8e1f 100644 (file)
--- a/Utility/StatelessOpenPGP.hs
+++ b/Utility/StatelessOpenPGP.hs
@@ -163,7 +163,7 @@ feedRead cmd subcmd params password emptydirectory feeder reader = do
        withTmpFile (toOsPath "sop") $ \tmpfile h -> do
                liftIO $ B.hPutStr h password
                liftIO $ hClose h
-               let passwordfile = [Param $ "--with-password=" ++ fromOsPath tmpfile]
+               let passwordfile = [Param $ "--with-password=" ++ fromRawFilePath (fromOsPath tmpfile)]
                -- Don't need to pass emptydirectory since @FD is not used,
                -- and so tmpfile also does not need to be made absolute.
                case emptydirectory of